Minor updates, bug fixes