some fix for running in standalone mode