Various changes mostly related to iOS alpha issues