More minor abstract updates