General Fixes

Made the LibMaker compilable again.