busyna: small structural fixes.