Fixed stupid compiler issues in