Brendan fixes