Type warning fixes.