More bugfixing due to CodeKit issues.