Fixing issues reported by Scrutinizr.