Various reflection improvements