Minor signature tweaks