Small fixes, preparing to staging.