Minor bug removals.