Vital fixes for 4.1 Jellybean