Small fixes for dry mode