Various improvements to handling of a/L