Includes fixes and improvements for normalize/denormalize methods