Minor changes to get local dev running