Fix setup
Some fixes