Black monday fixes