Fix error from merge; update framework lib to latest version