Fixed some merged changes with issues.