Fix some default variables