Header tweaks, update dependencies