cmcIII bugfixes from philipp deneu