Fixes in dev environment