Pub: Small fixes