Fixing some functionality that broke on the last rebase