Big fixes (2/24)

Big fixes