Fixed up last few bugs.