Fix compiler issues'