Minor updates and changes