My Fixes

Have to think about that :D