Fixed hard coding in last two places.