Fix name references and remove report menu
mac os x work around
mac os x work around