fix critial warnings