Setup position fixes, more to come