Tim codefixes