Bug fixes to abstraction layer