Fix some problems with finishers and operations