[misc] Fix wrongly embedded classes