Warning Clean Up and Minor Fixes