More GA tweaks