Android class fixes