some more fixes to get defaults working again