Updates to make everything work on another machine (god android/mvn is a pain).