Fixed some stale code commits.
More fixes