More Reflection Fixes