Fixes for 5.2