Minor bug fixes and additions