Fix advanced optimization issues with Boromir and Records