Small updates and bugfixes