Minor tweaks
Fix getFromServer