Support "colored" vertices
Fix "locking" issue due to overflow