Fixes for all the broken shit I coded two days ago :v