Fix for setup and windows dev