Fixed js stuff