minor changes in security context