Updates fixing tracked bugs

Type Component Title Status Bugs