fixes for types, removed duplicate interfaces