Cleaning up warnings