Few fixes necessary for the DoubleClick plugin to run.