Small Fixes

Small Fixes