[PATCH 2/2] Added conditional compilation of several application - bug fix