Fixed regexps for dependency detection