Improve little bugs