Small Fixes
more small fixes

Small Fixes