Fixed up some issues.