Fixing several artifacts from the last commit