more AT_ fixes