bugfixes for UZSU