Some more fixes for usedefault