Set a few more defaults just to be safe