Add some version checks