small fixes from colibri/application
Merge commit '3601e6ed90f22545749bebf1bf838637e8072b3d'