Minor fix

* TODO: Unit tests for these apps to avoid regressions