Code fix-up