Fixed up some problems.