Fixes + removed useless serialVersionUUIDs