everything fixed to work with latest reflection code.