Server fixes and additions