Translation fixes and some other stuff
Check that the metadata class exists
Formatting