More Fixes for 2.3