Typo fix
Updates to CUB's layouts