Fix some signatures and add some important missing methods