More green tweaks