64bit modifications