Fixes for nginx and apache templates