Improve post bugs