Fixed a few inconsistenciesZ