Bugfixes and iOS8 SDK compatibility