Adding missing defaults. This was causing problems overwriting variables