master state fixes