fixes from the first deploy