Resolve havana issues

WIP - do not merge