Some minor changes because of the support for JS compilation (#36)