Fixes to local setup