Fixed hbm file formatting issues