Random fixes for previous commits.