Bug fixes to abstraction layer
merge in al-bugfix