Got rid of lint warnings