Fixing more portable solution breaks