Fixed strncat and strlen