More short codes and helpers