Fix some stupid stuff