fix Wrap methods, fix solution files