Merged some missing changes