Minor bug fixes from previous updates