Fix loopholes