Additional bug/test/typo fixes