MacFarlane tweaks