Few tiny fixes