Fixes

I promise I tested these ones, Mloc.