Cleanup some typos
Resolve some differences between environments