Fix and improvements