Fixed some stupid issues