Fixed minor MCTT bugs