Some fixes for installation and missed includes.