Misc itest fixes.