Fixed some misc issues.