Various changes to support integrate/test targets