Fixes from 3.0 version