fixes for going live