Minor updates and bugfix