Fix Lint Errors for 1.1.4a Build