This merge request implements additional fixes that shall fix the various glitches that happened on the M1 builds.