fix common issues