Android puzle tweaks