M3 bug fixes

Just creating this so I have something to reference in GitHub issues. It's not quite ready to go in yet, but I'll comment when it is!