Fixes for compensation