MSS-16 fixes