More generic nginx fixes