Temporary fix to JS errors