Finish: fix small bugs