Fix some shit, hopefully no breaking more shit