Glitch fixes and compatibility improvements.