Fix Int/Long issue and updated bootstrap script