Issue #106: Proposals fixes