Fix some minor compiler issues