Minor changes, bug fixes