Minor bug fixes from previous commit