fixes for d5