Fixes for apache