[#1] Fixes for staging.