Fix/update friendly contexts