Final batch fixes.