Fixes in accord with 'noway421'