Small fixes to abstraction implementation