A few more changes