Server based fixes implemented in local solution