Tweaks to layer_guess