Fixes to 'undefined man' object