Fixed compiler error and raw types