More base case bug fixes