Updated for module fixes in ui