Small Fixes
merge tiny fix