New fixes and improvements