Various fixes, disabled MC integration temporarily