Further fixes for subfolder hosting