Fix abstract class stuff