A couple tweaks to method references