Actions based on @esc24's review.