CONTENTBOX-399: Small tweaks before major testing begins :)