Minor bug fixes for previous commits.