fixups/cleanup for 2.1.0