Final server fixes for API