Staging the fixes