Various changes to try and get things to work

IOS8 terrors.