Fixed a few initial version conflict bugs. Yay Android.