Fixes for pre-lollipop.