More misc fixes