Should fix a crash regarding missing methods.
Also updates the latest git push