minor changes for compatibility