Install/include bug fixes