Fixing Noval's bugs.