Fixed up recent abstraction issues