Minor bug/warning fixes.