Fixed minors issues.