0003. More minor fixes.