MSS-16 bootstrap fixes