A few tweaks to abide to new instructions