Remove unbound variable warnings

Remove unbound variable warnings that were resolved at runtime