updates to make android studio happy