Fix hard-corded strings