denormalization and fixes