Scheme tweaks