Even more small changes