Blip integration 2

Second round of tweaks to use in Blip

@jh-bate this should have no effects for Clamshell