Fix some AJP issues, not done yet.