Small leftover fixes.