more critics fixes: Skinner, Hée, D, AT