server: hotfixes