Fixes for standalone