Initial fixes.