A few tweaks which didn't fix the issue