Touch ups pre publish and a compatibility fix