BUG-17: couple of un-related privilege issues fixed