Fix empty JS issues (78 and 79)