Some fixes related to august staging