General Fixes

Updated it to work with the latest LGM.