More general fixes.