Nits from landry@