Big fixes (11/24)

Big fixes