Found some minor things that needed cleaning up post M1 release