Fixed Sehi's Last Commit

Got everything compiling