Fix defaults not being set