Some area fixes.