Final updates to work nicely on server