Version 1.21 - more minor fixes