Fix abstract and interface conflicts