fixes for the autolinking