hooks fixes