Minor maintenance fixes.