Huge amounts of JS fixes after modules