Latest fixes and improvements