Major fixes.