Fixed a few more bugs in the MCT Tools