Merge in dborca's updates