Reflection: Added some fixes