Fixed the bugs that Joel reported on 4/18.