Fixes for Pro version.