Minor updates and fixes