Working on small bugs