Made Fixes

Made Fixes