Fixed hard coding errors