Fix some stupid shit