subotage bugfixes