Fix staged build