Cleaned up issues from the previous commits.