More prop:val fixes