Setup bug fixes