diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java
index d21777c3..b2a75bfb 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java
@@ -16,15 +16,12 @@ import io.dropwizard.hibernate.AbstractDAO;
 
 public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T> {
 
-	private final JPAQueryFactory factory;
-
 	protected GenericDAO(SessionFactory sessionFactory) {
 		super(sessionFactory);
-		this.factory = new JPAQueryFactory(this::currentSession);
 	}
 
 	protected JPAQueryFactory query() {
-		return factory;
+		return new JPAQueryFactory(currentSession());
 	}
 
 	protected JPAUpdateClause updateQuery(EntityPath<T> entityPath) {
diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
index 899267ad..1f73e674 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
@@ -58,11 +58,11 @@ public class FeedEntryStatus extends AbstractModel {
 	}
 
 	public FeedEntryStatus(User user, FeedSubscription subscription, FeedEntry entry) {
-		setUser(user);
-		setSubscription(subscription);
-		setEntry(entry);
-		setEntryInserted(entry.getInserted());
-		setEntryUpdated(entry.getUpdated());
+		this.user = user;
+		this.subscription = subscription;
+		this.entry = entry;
+		this.entryInserted = entry.getInserted();
+		this.entryUpdated = entry.getUpdated();
 	}
 
 }
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AbstractCustomCodeServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AbstractCustomCodeServlet.java
index c71b1632..29df13f8 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AbstractCustomCodeServlet.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AbstractCustomCodeServlet.java
@@ -20,9 +20,9 @@ abstract class AbstractCustomCodeServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1L;
 
-	private final UnitOfWork unitOfWork;
-	private final UserDAO userDAO;
-	private final UserSettingsDAO userSettingsDAO;
+	private final transient UnitOfWork unitOfWork;
+	private final transient UserDAO userDAO;
+	private final transient UserSettingsDAO userSettingsDAO;
 
 	@Override
 	protected final void doGet(final HttpServletRequest req, HttpServletResponse resp) throws IOException {
diff --git a/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java b/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java
index 271c2a43..3b4cfaa8 100644
--- a/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java
+++ b/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java
@@ -23,14 +23,16 @@ import jakarta.websocket.Endpoint;
 import jakarta.websocket.EndpointConfig;
 import jakarta.websocket.Session;
 import jakarta.ws.rs.client.Entity;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 class WebSocketIT extends BaseIT {
 
 	@Test
 	void sessionClosedIfNotLoggedIn() throws DeploymentException, IOException {
 		AtomicBoolean connected = new AtomicBoolean();
 		AtomicReference<CloseReason> closeReasonRef = new AtomicReference<>();
-		try (Session ignored = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
+		try (Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
 			@Override
 			public void onOpen(Session session, EndpointConfig config) {
 				connected.set(true);
@@ -42,6 +44,7 @@ class WebSocketIT extends BaseIT {
 			}
 		}, buildConfig("fake-session-id"), URI.create(getWebSocketUrl()))) {
 			Awaitility.await().atMost(15, TimeUnit.SECONDS).untilTrue(connected);
+			log.info("connected to {}", session.getRequestURI());
 
 			Awaitility.await().atMost(15, TimeUnit.SECONDS).until(() -> closeReasonRef.get() != null);
 			Assertions.assertEquals(CloseReason.CloseCodes.VIOLATED_POLICY, closeReasonRef.get().getCloseCode());
@@ -54,7 +57,7 @@ class WebSocketIT extends BaseIT {
 
 		AtomicBoolean connected = new AtomicBoolean();
 		AtomicReference<String> messageRef = new AtomicReference<>();
-		try (Session ignored = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
+		try (Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
 			@Override
 			public void onOpen(Session session, EndpointConfig config) {
 				session.addMessageHandler(String.class, messageRef::set);
@@ -62,6 +65,7 @@ class WebSocketIT extends BaseIT {
 			}
 		}, buildConfig(sessionId), URI.create(getWebSocketUrl()))) {
 			Awaitility.await().atMost(15, TimeUnit.SECONDS).untilTrue(connected);
+			log.info("connected to {}", session.getRequestURI());
 
 			Long subscriptionId = subscribe(getFeedUrl());
 
@@ -83,7 +87,7 @@ class WebSocketIT extends BaseIT {
 
 		AtomicBoolean connected = new AtomicBoolean();
 		AtomicReference<String> messageRef = new AtomicReference<>();
-		try (Session ignored = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
+		try (Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
 			@Override
 			public void onOpen(Session session, EndpointConfig config) {
 				session.addMessageHandler(String.class, messageRef::set);
@@ -91,6 +95,7 @@ class WebSocketIT extends BaseIT {
 			}
 		}, buildConfig(sessionId), URI.create(getWebSocketUrl()))) {
 			Awaitility.await().atMost(15, TimeUnit.SECONDS).untilTrue(connected);
+			log.info("connected to {}", session.getRequestURI());
 
 			feedNowReturnsMoreEntries();
 			forceRefreshAllFeeds();
@@ -115,6 +120,7 @@ class WebSocketIT extends BaseIT {
 			}
 		}, buildConfig(sessionId), URI.create(getWebSocketUrl()))) {
 			Awaitility.await().atMost(15, TimeUnit.SECONDS).untilTrue(connected);
+			log.info("connected to {}", session.getRequestURI());
 
 			session.getAsyncRemote().sendText("ping");