Fixing some mistakes from past