Fix gotchas