WEBCMS-113 - Fixed code for code sniffs and minor bugfixes.