modular: fixing js issues