security fix + debug sugar