Mate 1.5 cleanups and version bumps