Misc small fixes

Mostly unXFAILing tests; see commit messages