Minor improvements

Several minor improvements