Fix keys for lollipop
Clean up & permission