Review Request 27: fix setup bugs