Pub form fixes

From #4403.