Updated modules and fixed some export guard issues.