Changed behaviour of default application options