Fix Bug BR hack and add some references