More bugs fixed with UUID.