Ref T16 fixes to apache configuration@