Fixed minor issues to make scrutinizer a bit happier.