MX-1223, compilation fixes