fixes for preventing async troubles