Fixes for compatibility