Version 12: A few bug fixes