Fix stuff that needs fixing. Thanks @NobleFable