Changes to make branch compile and run tests