CS and v5.3 fixes