Changes before merging with 32 bit repo