E0d/style fixes