apache: Fixing build errors