Adjust Mac Menu support, mostly fixes #5