Fix bringup derps

Change-Id: I6fad14aa9366bab63e2ff8e01948539edaef0d1f