Fix access bugs