Small fixes to prepare for v1beta3