More combined fixes