Fixing up some local dev environment issues