Small updates and improvements