Fixes for finish call