Bug fixes, check previous commits.