Follow up with fixes to guest_environment.