Cleanup, app uniqueness, warning message fixes