A couple quick improvements