Minor application improvements