Updated to latest Examine with lock fixes