Fixes for Nienhaus, also maybe fixing the dresdenunder.