fixes for enable more flexibility