Fix edge cases with datey and secondary axes