minor type improvements