Fix some real stupid shit