fix assets & helpers