Fixed bugs in mcm.core

Signed-off-by: Andreas Larsen <northcode.no@gmail.com>