Get defaults working better