minor fixins