Fixes for 4.8