Merged dice roller changes