Fixes regarding access levels