Merging in Lensman's first round of Fixes