Fixed compile errors again 2 / errors due to repository mixing