Fixes and android assets