Various fixies and duplicate definitions.