Fixed proposal bugs