Some minor JCR tweaks