Cleaned up 64 bit warnings and fixed a potential problem with a weak property.