Minor bufixing