A couple more minor updates