MOAR fixes

Change-Id: I8e1340dae2c328ccebe29c060cc489f632153646