Minor changes that I found in some experiemental branches