Fix things based on review from Damien