Fixing labels from previous versions

* Include messages if available
* Added FIXMEs all over the code