Fixed doctrine entity validation errors, codestyle fixes