fixes for dustin