Version agnosticism fixes