Fixed minor issues, and restored app execution