Fixed some issues with reflection due to new libraries.