RISEUP fixes