Minor library and app changes