Last tweaks to make this work (hopefully)