Dugga and dugga submit fixes