Final tweaks to make sure something works, at elast