More adjusting of sizes in Classic/Remora