misc tiny fixes