Misc fixes due to Lem changes

I already made these changes on the Word8array branch...