Bug fixes in abstraction