Minor updates and bugfixes