WY: Some tweaks to start getting ready