More dirty fixes that should now really close #1