Small misc improvements