tweaks to get staging to work