Latest bug fixes by Mike