Fix Cancel link positioning, fix watermark error reply (seems to have already been broken in v3.0.4...)