Port some changes from C-Rom