Cleaning up warnings. -Jon