Fixed compiler issues