Fix some issues to fit new framework