Update changes

Contains some hot fix