More updates to support generic nginx