Fix some consistancy issues.