Minor bug fixes, etc.