some blanket updates to get working