Fix conversion of words and bytes