Snowdrop-69 and Snowdrop-68 fixes