Fixes to make instance reusable