A couple more changes...