Fix setup script in Fish + small setup fixes