Bug Fix

Small bug fixes
Bug fixes

Little corrections