Finish cleaning up warnings