Android annotations small fixes