Minor bug fixes prior to first beta on Android