Fix add include (bug #966) and small update to bug 890