Minor changes, mostly for future use