Fixed build
Removed a few reflection calls