Some small improvements to astrant-extensions