Minor bug fixes
Minor bug fixes