Post N9. Timestamp and style fixes