Fix some stupid issues