Redux fixes and updates