small bugs cleanup