Hpp compilation fixes