fixes for compatibility