Development Environment Fix