Minor changes - doesn't affect really usage...