Small fixes
Some small changes.