Fixed failed staging tests