Fix setup problems

This really closes #1