some quick fixes for bugs found at first deploy