Make Publish a bit more hardcore