minor bug fixes
bug fixes