Changed  to  in several spots