Fix/Finish commands