fix all hbm issues

try to fix application bugs