Warning fixes for last commit