Permission tweaks and lang stuff for tests