A few more changes to get in line with other examples