Some small changes
Small fixes