some src and installation path fixes