Small changes to both