First commit fixing some local setup issues