and fixing a couple issues introduced in the last commit