Reflection fixes