Fix version compare and fallback