six fixes