Fixed another set of bad shift and sign extension errors