Fixed a few ray tracing bugs due to Geometry refactorization