Merges latest fixes from my branch