small fixes for sync to ultimate-base