Minor constructor improvements