Skip 64bit test on 32bit

Also minor type improvements