Fixes for non-built sim running