Fix lint warnings - no functional changes