more nil fixes