final multi fixes