A couple clean up items