Attempt some fixes.