various changes to link contracts and the bootstrap interceptor