Fixes for 2.1.49.