Improve standalone startup