Fixed access level related bugs