Fixing some key issues with mc. Thanks nsz!