small fixes from colibri/application