PULL FIXES - Pull Cleanup 2

Additional fixes.