Bringup and fixes