Bug fixes, part II