Fixed undefined references and listings