(1) Removing original type retrieval from attribute index
(2) Added braces for a switch case in bp_utils.c
(3) Added math.h in bp_utils.c