Fixed stupid issues