applying fixes for the new architecture