More minor changes for linking apps and some bug fixes