More fixes and publish