Minor bug fixes and package updates.