Few strings fixes