Misc changes to get stuff working.