Follow latest tweaks of original repo