Work on fixing access privileges