Correct libraries and references