General set of fixes.