Just a set of fixes.