various tiny fixes: