Common fixes.