My Fixes

Here too. pls no static here :)