Minor changes to behaviour