more fixes for new include script stuff...