Some more fixes

<3