More apache fixes.