Commiter fixes