Minor fixex