A bit of fixes.