moaaar bug fixes

Change-Id: Icfa11e959b6d25b7f941a9938d9759091558bd56