fix some of the 'prebuilt instance' warnings