fixes some issues with default variables added in last commit