Cleanup some minor warnings