Solutions fixes