Fixing a few bugs from last commit