bug fixes
minor