Fix tools not being loaded; Add additional path variables