Small misc changes