Fixed setup bugs