Abstract fixes