Updates/fixes/tweaks to get the user capability stuff working properly