more general fixes