A couple misc changes