Environment Setup Fixes