Fix some more access issues