Range form fixes