Few more tiny fixes