Fixes to the aforementioned tweaks