Big fixes (23/24)

Big fixes