Fix server notes and cluster support