fix setup bugs