Small misc fixes