Fixed bugs due to an interface change and that only appeared after performing a rebase.