more sensible fixes