fix small bugs when migrating to staging