Fixes to ProposalsContext together with fixes in proposal wrapper