Fixes for standalone operation