Fixed several issues with ECOOP14