Updating hardcoded type sizes to be sizeof()