More work to isolate compilation problem
Still chasing compilation problem