bug fixes
Small fixes