General Fixes

Updated it to be compilable with latest LGM stuff.