diff --git a/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorNodePlugin.java b/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorNodePlugin.java
index e407610631fe829866af3f4be154893fb5585f0b..df8ec7ddf9ae0b65f0ba8173cf0e9b262aaa8d20 100644
--- a/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorNodePlugin.java
+++ b/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorNodePlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2013-2017 Hippo B.V. (http://www.onehippo.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -233,9 +233,9 @@ public class CKEditorNodePlugin extends AbstractCKEditorPlugin<Node> {
         return null;
     }
 
-    private IBrowseService getBrowser() {
+    private IBrowseService<IModel<Node>> getBrowser() {
         final String browserId = getPluginConfig().getString(IBrowseService.BROWSER_ID, "service.browse");
-        return getPluginContext().getService(browserId, IBrowseService.class);
+        return (IBrowseService<IModel<Node>>) getPluginContext().getService(browserId, IBrowseService.class);
     }
 
     private IModel<Node> getNodeModel() {
diff --git a/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/PreviewLinksBehavior.java b/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/PreviewLinksBehavior.java
index df055d9a1da10c748dcbb1d342e5c601cb2f83ee..aa107d42d50c4834529dd6482ce43928dcc28511 100644
--- a/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/PreviewLinksBehavior.java
+++ b/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/PreviewLinksBehavior.java
@@ -25,6 +25,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
 import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.Request;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
@@ -45,9 +46,9 @@ class PreviewLinksBehavior extends AbstractDefaultAjaxBehavior {
     private static final ResourceReference PREVIEW_LINKS_SERVICE_JS =
             new JavaScriptResourceReference(PreviewLinksBehavior.class, "preview-links-service.js");
 
-    private final IBrowseService browser;
+    private final IBrowseService<IModel<Node>> browser;
 
-    PreviewLinksBehavior(final IBrowseService browser) {
+    PreviewLinksBehavior(final IBrowseService<IModel<Node>> browser) {
         this.browser = browser;
     }
 
@@ -58,7 +59,6 @@ class PreviewLinksBehavior extends AbstractDefaultAjaxBehavior {
         if (uuid != null && !"null".equals(uuid) && browser != null) {
             final Node targetNode = getNodeById(uuid);
             if (targetNode == null) {
-                log.info("Node with UUID {} could not be loaded", uuid);
                 final String message = new ClassResourceModel("brokenlink-alert",
                                                               PreviewLinksBehavior.class).getObject();
                 target.appendJavaScript("alert('" + message + "');");
@@ -76,6 +76,7 @@ class PreviewLinksBehavior extends AbstractDefaultAjaxBehavior {
                 return targetNode;
             }
         } catch (final RepositoryException ignore) {
+            log.info("Node with UUID {} could not be loaded", uuid, ignore);
         }
         return null;
     }
diff --git a/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/RichTextDiffWithLinksAndImagesPanel.java b/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/RichTextDiffWithLinksAndImagesPanel.java
index 47c6769cb1584ce0089e9843def3eaf93f7b17e6..8cd8d12226317ca4fa2191010de78d7e2c567771 100644
--- a/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/RichTextDiffWithLinksAndImagesPanel.java
+++ b/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/RichTextDiffWithLinksAndImagesPanel.java
@@ -57,7 +57,7 @@ public class RichTextDiffWithLinksAndImagesPanel extends AbstractRichTextDiffPan
     public RichTextDiffWithLinksAndImagesPanel(final String id,
                                                final IModel<Node> baseNodeModel,
                                                final IModel<Node> currentNodeModel,
-                                               final IBrowseService browser,
+                                               final IBrowseService<IModel<Node>> browser,
                                                final DiffService diffService,
                                                final IHtmlCleanerService cleaner) {
         super(id);
@@ -103,14 +103,14 @@ public class RichTextDiffWithLinksAndImagesPanel extends AbstractRichTextDiffPan
         return new HtmlDiffModel(scriptlessBase, scriptlessCurrent, diffService);
     }
 
-    private static JcrPropertyValueModel getContentModelOrNull(final IModel<Node> nodeModel) {
+    private static JcrPropertyValueModel<String> getContentModelOrNull(final IModel<Node> nodeModel) {
         final Node node = nodeModel.getObject();
         try {
             if (node == null) {
                 return null;
             }
             final Property prop = node.getProperty(HippoStdNodeType.HIPPOSTD_CONTENT);
-            return new JcrPropertyValueModel(new JcrPropertyModel(prop));
+            return new JcrPropertyValueModel<>(new JcrPropertyModel(prop));
         } catch (final RepositoryException e) {
             log.error("Cannot read HTML content from '" + JcrUtils.getNodePathQuietly(node) + "'", e);
         }
diff --git a/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/RichTextPreviewWithLinksAndImagesPanel.java b/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/RichTextPreviewWithLinksAndImagesPanel.java
index f925621d87803009b7a8088ea141c174c1961865..7f52d8c800c6d9cdc2e26d9cc8b5036b14ea1471 100644
--- a/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/RichTextPreviewWithLinksAndImagesPanel.java
+++ b/richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/view/RichTextPreviewWithLinksAndImagesPanel.java
@@ -38,7 +38,7 @@ public class RichTextPreviewWithLinksAndImagesPanel extends AbstractRichTextView
     public RichTextPreviewWithLinksAndImagesPanel(final String id,
                                                   final IModel<Node> nodeModel,
                                                   final IModel<String> htmlModel,
-                                                  final IBrowseService browser,
+                                                  final IBrowseService<IModel<Node>> browser,
                                                   final IHtmlCleanerService cleaner) {
         super(id);