Fixed a few App and Library bugs