A couple extra changes