Fixes for more recent apache
Fix assets
More fixes