RPA Toolkit
Build system fixes.