Fix SERVER handling for remote servers