Fixes for shakira kitkat