Fixes based on Travis's comments
Merged from work machine