Setup bugfix

Fixed some bus that appeared during testing.