fixes for new scheme