Build 2222 - Maintenance

This is a maintenance update with several small improvements.