Minor extra changes from Jason