Ensure max velocity > 0 even when null