Fixed some errors from old project