Fixed babel issues