Minor refactorings
Added rule to build for 64bit