Latest Polymost Fixes by Randy Heit