mdomsch's patches for Planet Venus