Minor fixxes.