Fixes some bugs with broadway.