Bug fixes with finding . and _