Fix up setup

@dhui