My Fixes

Tested?