Few more small bugs