Initial fix-up