Minor bug fixes and updates.