Credits ordering fixes, see #70