Fix library name, fix short literals