Debugging code to fix build