More linkjs/linkcss fixes