Manual fixes