@aaronte - Fixed errrors