Fix last couple of things