fix global issues