Fixes for 3.0