Fix up JS types