More general fixes