ACL for client interface
Don't query glue records when it's not necessary
More style improvements