Remove couple FIXMEs
Github issue #27: proper Message timestamping