Fixes galore/finish