more bloody fixes