updates due to dapi template changes, etc.