server pattern fixes