Fixes. Still need to add BSD sub logic