Fixes for propegation handling on iPhone