Various changes
Merged latest changes