forum fix + others