A few fixxes