Fixes for jellybean