Fixing some lint warnings