Fix for standalone compilation/testing