Aggressive Lint warning fixing