Fix setup

Some tiny fixes.