Fix some for integration with FRB stack