Various fixes (tested against Reus)