More updates for using the stand-alone generator project