fixes for dave