some final fixes before deploy to staging