Minor bug fixes
Minor fixes