Review fixes for m00bles