small fixes from colibri/application
Merge commit 'a9830f2f61d17dbbfeb4c784eadc07f71e6f79ee'