Fixes to allow proper use of the interface